widget-factory: Move the popover bar to the ui file
authorMatthias Clasen <mclasen@redhat.com>
Sat, 8 Jun 2019 15:28:22 +0000 (15:28 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 9 Jun 2019 17:38:54 +0000 (17:38 +0000)
demos/widget-factory/widget-factory.c
demos/widget-factory/widget-factory.ui

index 7faffdbd0893fc176af07251ffa721daa5290b24..678d5f5f1c045e63c0ceebf76f926fa11be73094 100644 (file)
@@ -1931,12 +1931,6 @@ activate (GApplication *app)
   model = (GMenuModel *)gtk_builder_get_object (builder, "new_style_context_menu_model");
   set_up_context_popover (widget, model);
 
-  widget = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (builder, "page2frame2")));
-  model = (GMenuModel *)gtk_builder_get_object (builder, "menu_bar_model");
-  widget2 = gtk_popover_bar_new_from_model (model);
-  gtk_container_add (GTK_CONTAINER (widget), widget2);
-  gtk_box_reorder_child_after (GTK_BOX (widget), widget2, NULL);
-
   gtk_widget_show (GTK_WIDGET (window));
 
   g_object_unref (builder);
index 2c7e6bc0b306f9b9d4564a263d2bd9bf57f47f8b..7b873fbc8a297adddeef2f9b4e0a7b2d52cb58ca 100644 (file)
@@ -1821,6 +1821,11 @@ microphone-sensitivity-medium-symbolic</property>
                                 <child>
                                   <object class="GtkBox">
                                     <property name="orientation">vertical</property>
+                                    <child>
+                                      <object class="GtkPopoverBar">
+                                        <property name="menu-model">menu_bar_model</property>
+                                      </object>
+                                    </child>
                                     <child>
                                       <object class="GtkMenuBar">
                                         <child>